Make sure we dist all testsuite ingredients

diff --git a/testsuite/a11y/Makefile.am b/testsuite/a11y/Makefile.am
index 47b9a96b22ef07d9619715f46811be39a616b316..e5fed94d3c4e0517fcca0d6b668a7dab11f764bb 100644 (file)
--- a/testsuite/a11y/Makefile.am
+++ b/testsuite/a11y/Makefile.am
@@ -75,6 +75,18 @@ testdata = \
        combos.ui combos.txt \
        $(NULL)
 
+test_in_files = \
+       a11ytests.test.in \
+       a11ychildren.test.in \
+       a11ytree.test.in \
+       a11yvalue.test.in \
+       a11yderive.test.in \
+       a11ytext.test.in \
+       a11yutil.test.in \
+       $(NULL)
+
+EXTRA_DIST += $(test_in_files)
+
 if BUILDOPT_INSTALL_TESTS
 insttestdir=$(pkglibexecdir)/installed-tests
 insttest_PROGRAMS = $(TEST_PROGS)
@@ -86,23 +98,11 @@ substitutions = \
        -e s,@pkglibexecdir\@,$(pkglibexecdir),g \
        $(NULL)
 
-test_in_files = \
-       a11ytests.test.in \
-       a11ychildren.test.in \
-       a11ytree.test.in \
-       a11yvalue.test.in \
-       a11yderive.test.in \
-       a11ytext.test.in \
-       a11yutil.test.in \
-       $(NULL)
-
 test_files = $(test_in_files:.test.in=.test)
 
 $(test_files): %.test: %.test.in
        $(AM_V_GEN) sed $(substitutions) $< > $@.tmp && mv $@.tmp $@
 
-EXTRA_DIST += $(test_in_files)
-
 testmetadir = $(datadir)/installed-tests/$(PACKAGE)
 testmeta_DATA = $(test_files)
 endif

diff --git a/testsuite/css/Makefile.am b/testsuite/css/Makefile.am
index 4275b2742e09b44bdb752b7510f3ef7654580cb7..d1cda52987164ad3b8570b47087bdaee88a3c9ab 100644 (file)
--- a/testsuite/css/Makefile.am
+++ b/testsuite/css/Makefile.am
@@ -22,9 +22,11 @@ LDADD = \
        $(top_builddir)/gtk/libgtk-3.la \
        $(GTK_DEP_LIBS)
 
-TEST_PROGS += api 
+TEST_PROGS += api
 test_in_files += api.test.in
 
+EXTRA_DIST += $(test_in_files)
+
 if BUILDOPT_INSTALL_TESTS
 insttestdir=$(pkglibexecdir)/installed-tests/css
 insttest_PROGRAMS = $(TEST_PROGS)
@@ -38,8 +40,6 @@ test_files = $(test_in_files:.test.in=.test)
 $(test_files): %.test: %.test.in
        $(AM_V_GEN) sed $(substitutions) $< > $@.tmp && mv $@.tmp $@
 
-EXTRA_DIST += $(test_in_files)
-
 testmetadir = $(datadir)/installed-tests/$(PACKAGE)/css
 testmeta_DATA = $(test_files)
 endif

diff --git a/testsuite/css/parser/Makefile.am b/testsuite/css/parser/Makefile.am
index 25f3f7f785552c13a157dff7f6de9e46be08e3e2..873a048f45cc32c209809eb1144868c3e2b42236 100644 (file)
--- a/testsuite/css/parser/Makefile.am
+++ b/testsuite/css/parser/Makefile.am
@@ -348,6 +348,8 @@ test_data = \
        widget-style-property.css \
        $(NULL)
 
+EXTRA_DIST += $(test_in_files) $(test_data)
+
 if BUILDOPT_INSTALL_TESTS
 insttestdir=$(pkglibexecdir)/installed-tests/css/parser
 insttest_PROGRAMS = $(TEST_PROGS)

diff --git a/testsuite/gdk/Makefile.am b/testsuite/gdk/Makefile.am
index bd9a3b392fac6cfaae54b2a4ad57408acc6b2ea0..a8fd35d1c449a2e0a656e88ad0d9ce2a43057d93 100644 (file)
--- a/testsuite/gdk/Makefile.am
+++ b/testsuite/gdk/Makefile.am
@@ -35,9 +35,19 @@ TEST_PROGS        += keysyms
 keysyms_SOURCES    = keysyms.c
 keysyms_LDADD      = $(progs_ldadd)
 
-CLEANFILES = \
+CLEANFILES =                   \
        cairosurface.png        \
-       gdksurface.png
+       gdksurface.png          \
+       $(NULL)
+
+test_in_files =                \
+       rgba.test.in            \
+       encoding.test.in        \
+       display.test.in         \
+       keysyms.test.in         \
+       $(NULL)
+
+EXTRA_DIST += $(test_in_files)
 
 if BUILDOPT_INSTALL_TESTS
 insttestdir=$(pkglibexecdir)/installed-tests
@@ -47,20 +57,11 @@ substitutions = \
        -e s,@pkglibexecdir\@,$(pkglibexecdir),g \
        $(NULL)
 
-test_in_files = \
-       rgba.test.in \
-       encoding.test.in \
-       display.test.in \
-       keysyms.test.in \
-       $(NULL)
-
 test_files = $(test_in_files:.test.in=.test)
 
 $(test_files): %.test: %.test.in
        $(AM_V_GEN) sed $(substitutions) $< > $@.tmp && mv $@.tmp $@
 
-EXTRA_DIST += $(test_in_files)
-
 testmetadir = $(datadir)/installed-tests/$(PACKAGE)
 testmeta_DATA = $(test_files)
 endif

diff --git a/testsuite/gtk/Makefile.am b/testsuite/gtk/Makefile.am
index 99c9ab5beda4ced442de2883483a262a1ced7738..06918f69888397b8fb0a6f2e1ea82e63001fdedb 100644 (file)
--- a/testsuite/gtk/Makefile.am
+++ b/testsuite/gtk/Makefile.am
@@ -1,8 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-NULL=
-
-SUBDIRS =
+NULL =
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)                 \
@@ -221,8 +219,10 @@ window_SOURCES                      = window.c
 window_LDADD                    = $(progs_ldadd)
 
 EXTRA_DIST +=                          \
+       $(test_in_files)                \
        file-chooser-test-dir/empty     \
-       file-chooser-test-dir/text.txt
+       file-chooser-test-dir/text.txt  \
+       $(NULL)
 
 if BUILDOPT_INSTALL_TESTS
 insttestdir=$(pkglibexecdir)/installed-tests
@@ -237,8 +237,6 @@ test_files = $(test_in_files:.test.in=.test)
 $(test_files): %.test: %.test.in
        $(AM_V_GEN) sed $(substitutions) $< > $@.tmp && mv $@.tmp $@
 
-EXTRA_DIST += $(test_in_files)
-
 testmetadir = $(datadir)/installed-tests/$(PACKAGE)
 testmeta_DATA = $(test_files)
 endif

diff --git a/testsuite/reftests/Makefile.am b/testsuite/reftests/Makefile.am
index f1ad61cf2539ea75170b2435f7f2fca6298b1122..efd3edd398aba7200e5c17bae890ce6ab1b50606 100644 (file)
--- a/testsuite/reftests/Makefile.am
+++ b/testsuite/reftests/Makefile.am
@@ -282,6 +282,11 @@ testdata = \
        window-default-size.ui \
        $(NULL)
 
+EXTRA_DIST +=                  \
+       (testdata)              \
+       reftests.test.in        \
+       $(NULL)
+
 if BUILDOPT_INSTALL_TESTS
 insttestdir=$(pkglibexecdir)/installed-tests
 insttest_PROGRAMS = gtk-reftest
@@ -296,9 +301,6 @@ substitutions = \
 reftests.test: reftests.test.in Makefile
        $(AM_V_GEN) sed $(substitutions) $< > $@.tmp && mv $@.tmp $@
 
-EXTRA_DIST += \
-       reftests.test.in
-
 testmetadir = $(datadir)/installed-tests/$(PACKAGE)
 testmeta_DATA = reftests.test
 endif